Merged
Conversation
… and StatforNPC. Also have outline for ClearActive in comments.
SquareMan
requested changes
Feb 16, 2025
…d en_SM_NOTICES to zNPCTypeCommon to avoid recursive include.
…Spawner instead of transitively via zNPCTypeCommon.
SquareMan
approved these changes
Feb 16, 2025
Member
SquareMan
left a comment
SquareMan
left a comment
There was a problem hiding this comment.
LGTM. Welcome Aboard!
Left a few nits on some stuff since some of it is still very "decompiler-esque" but not gonna block merging since this code is all very WIP still anyways.
Comment on lines
+196
to
+207
| do | ||
| { | ||
| temp_r29 = var_r30->npc_owner; | ||
| if (((zNPCCommon*)var_r30->npc_owner != NULL) && ((s32)temp_r29->flg_vuln == 1)) | ||
| { | ||
| XOrdAppend(&this->pendlist, (void*)temp_r29); | ||
| temp_r29->flg_vuln = 2; | ||
| } | ||
| var_r28 += 1; | ||
| var_r30 += 0xC; | ||
| } while (var_r28 < 0x10); | ||
| return &this->actvlist; |
Member
There was a problem hiding this comment.
This is probably some sort of for loop over an array, with var_r29 and var_r30 being compiler generated variables related to indexing an array.
Comment on lines
+250
to
+256
| zNPCCommon* temp_r0_2; | ||
| zNPCCommon* temp_r0_3; | ||
| zNPCCommon* temp_r0_4; | ||
| zNPCCommon* temp_r0_5; | ||
| zNPCCommon* temp_r0_6; | ||
| zNPCCommon* temp_r0_7; | ||
| zNPCCommon* temp_r0_8; |
Member
There was a problem hiding this comment.
eventually all these unused variables from decompiler output should be cleaned up
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Added several methods with partial code match to zNPCSpawner and some light struct edits to incorporate these.